From 7e4707642adc0152fdb9fb6d6aa6d01c605bebbf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 25 Mar 2019 20:26:59 -0400 Subject: [PATCH] gtk: Stop using gdk_device_get_position We should always use the double variant of this api. --- gtk/gtknotebook.c | 12 ++++++------ gtk/gtkwindow.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index a23f9c41b7..4afc889aee 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3137,11 +3137,11 @@ gtk_notebook_drag_end (GtkWidget *widget, if (priv->rootwindow_drop) { GtkNotebook *dest_notebook = NULL; - gint x, y; + double x, y; - gdk_device_get_position (gdk_drag_get_device (drag), &x, &y); + gdk_device_get_position_double (gdk_drag_get_device (drag), &x, &y); g_signal_emit (notebook, notebook_signals[CREATE_WINDOW], 0, - priv->detached_tab->child, x, y, &dest_notebook); + priv->detached_tab->child, round (x), round (y), &dest_notebook); if (dest_notebook) do_detach_tab (notebook, dest_notebook, priv->detached_tab->child); @@ -3186,12 +3186,12 @@ gtk_notebook_drag_failed (GtkWidget *widget, if (result == GTK_DRAG_RESULT_NO_TARGET) { GtkNotebook *dest_notebook = NULL; - gint x, y; + double x, y; - gdk_device_get_position (gdk_drag_get_device (drag), &x, &y); + gdk_device_get_position_double (gdk_drag_get_device (drag), &x, &y); g_signal_emit (notebook, notebook_signals[CREATE_WINDOW], 0, - priv->detached_tab->child, x, y, &dest_notebook); + priv->detached_tab->child, round (x), round (y), &dest_notebook); if (dest_notebook) do_detach_tab (notebook, dest_notebook, priv->detached_tab->child); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 6a91dc6009..71be75328a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -7261,13 +7261,13 @@ static GdkMonitor * get_monitor_containing_pointer (GtkWindow *window) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); - gint px, py; + double px, py; GdkDevice *pointer; pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (priv->display)); - gdk_device_get_position (pointer, &px, &py); + gdk_device_get_position_double (pointer, &px, &py); - return gdk_display_get_monitor_at_point (priv->display, px, py); + return gdk_display_get_monitor_at_point (priv->display, round (px), round (py)); } static void @@ -7428,15 +7428,15 @@ gtk_window_compute_configure_request (GtkWindow *window, GdkRectangle area; GdkDevice *pointer; GdkMonitor *monitor; - gint px, py; + double px, py; pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (priv->display)); - gdk_device_get_position (pointer, &px, &py); - monitor = gdk_display_get_monitor_at_point (priv->display, px, py); + gdk_device_get_position_double (pointer, &px, &py); + monitor = gdk_display_get_monitor_at_point (priv->display, round (px), round (py)); - x = px - w / 2; - y = py - h / 2; + x = round (px) - w / 2; + y = round (py) - h / 2; /* Clamp onto current monitor, ignoring _NET_WM_STRUT and * WM decorations. -- 2.30.2